Fixing a couple issues with calculating month and year