Now compiles with vm-upgrade fixes