This fixes #7921.  This sets the things properly to ints.
A fix for bug #7887.  The time is now set properly.
This is more of the fix for bug #7921.