[TW371] - Fix crashes and final push on the instance command