Private branch changes

Couple of changes - not sure they are needed in main commit