Yet again more changes to try and make dock work