Few more derp fixes