Post-Launch Fixes

Post-Launch Fixes before announcement.