Fix some prod bugs