Fixing a few more things
-Mark Earl