Fixed a few minor things broken by the previous commit