Zero-Span marker and text color bug fixes