Fixed stuff I forgot to test, derp