Cleaning up minor stuff
Fixing two missed things from clean up