minor fixes to sync master branch