Multiple fixes to files and scripts.