misc changes due to Vova requests