Span Class Fixes