Pre launch Fixes