Massive message cleanup, gracefully handle failed startups, other misc
fixes