Fixed issues with time/date objects in JSON