Yet more changs to try and get things working.