Correct some package names etc.