Fixed more big dumb VM problems