Additional changes to try and fix issues.