Bug fixes
51 files changed