minor fixes to master
minor fixes to master