Bug Fixes

Close:
Bug #2277
Bug #2278
Bug #2279
Bug #2280