Some fixed in the main file.