Fixed date comparison by moving into NSCalendar category where it belongs