Patch 2

Just a couple of really small fixes