Code Corrections for the Calendar Pull Request