More derp fixes