Some fixes to master.