Fixing some Minor Bugs

Closed:
Bug #376
Bug #377
Bug #378