More changes to try and fix dependency issues