Final fixes to master