Attempt some more fixings