Fixes to compile on new vm