Misc changes

Add some code to get ready for parsing dates.