Minor fixes to make sure everything works after the fresh conversion.