Fixes to main