Fixes to last change