OS-2420 minor date bugs from code review comments