Fixes to recent changes