Pre launch tweaks