Minor fixes that don't affect anyone but me (James)