Fix derp and remove two tweaks