The last thing turned out to be fine. It was just that our files originally used spaces, but they got imported with underscores, so the pages that used them needed updating.
Not sure if the image attribution is worth re-importing, but good to know it is fixed for others. Thanks as always. I'll let you know if we find any 4.0.4 bugs :P