Fixed some field names and made prod ready