Fix some errors on production