fixing some of the things that went wrong in that merge yesterday