Additional revisions for Origin VM