2 of the "Easy Fix" bug-fixes

Solves issues #1160 and #272. Also removed some unneeded spaces I stumbled upon.