Add GATEWAY const to production...