minor changes

minor changes
minor changes to cope with infra related changes
Merge remote-tracking branch 'origin/master'