Some work on fixing the platform disappear on startup (which seems to have resurfaced)