Fixed even more files.