Added some joda time fixes