Updates to better support Origin VM