Fixing stunbaton runtimes