Chore/production deploy - More production fixes