Return null rather than -1d for several datapoint items

Change some of the obvious items that where -1 might be an accurate value.

Matt