minor fixes to master