More VM Fixes