Various changes following Nova review on gerrit