VOM fixes for 9090 - ships in the night commits