Few derp fixes after merge