V11 Misc Final Changes

Just minor changes  before sync branches