Imported bug fixes
2 files changed