Final soft launch bugfixes