Changes to support prod only build