Prelaunch fixes

Leaving open for now