Topic/pre launch issues

Fixes issues caught by Deb in testing yesterday.