Attempting to fix issues on dev/prod