Fix stupid mistakes and oversights found while testing with cardboard
(thanks Nevon)