Minor updates to Span