Launch day fixes