Fixes to master