Minor changes to fix broken stuff.