Fixed a few things I missed