Re-running support and fixes