a little more VP fixes