Fix date widget handling