Fix derp before initial merge