pre-launch bug fixes