Bug fixes to last night's hacks