Attempt some more fixes