Fix keep-alive for the current system, and make it properly controllable per-world