Fixes to above