Pull request for requested fixes

Two commits both made at semi-direct request rather than semi-drunken randomness, yay!