Fixes to last nights regression