Small fixes eliminating insignificant differences with master branch