Bug fixes
7 files changed