Fixing some things I missed