final prelaunch fixes