Various fixes to master