Add calendar picker fixes