Fixing minor issues for merge to master