Fixed issues in the code caused by Git marking differences.