Fix the issues with these three files