[1625] Various changes recommended in PR