ISIS-479: further fixes for joda dates