Updates to attempt to fix issues in production