Fixed weird issues I keep finding...

This actually makes me very upset... >:(