Post-launch fixes