Just some changes to try and fix issues
Some more changes and fixes