Multiple fixes pre-launch