Some derp fixes