Minor fixes on calendar picker