Minor changes to the span model

Change-Id: If958f56233d314989c08b67234b2d0c3082cb130
Signed-off-by: Tom Flynn <tom.flynn@gmail.com>