Fixup master

Fix issues with master.