Downtime support, cleanup, bugfixes