Fixed more workflow and orphan VM problems.