Fixes for VM operability