Bug fixes
3 files changed