some fix + vm fix