Fix date selector bugs