More Bug Fixes

Close:
Bug #295
Bug #296