Few derp fixes