Fix some of the application files