More tweaks for Origin VM