Added post-launch fixes