fixed a few inconsistencies with null date support