Fixups
Merge branch 'master' into live