Prelaunch fixes
Merge pull request #6 from rianrainey/fixes/5

Prelaunch fixes