Troubleshooting changes

This should be good for deployment when the field IDs are changed to the
production IDs