Some fixes because I derp anyway!