Add some span flags.
Fix some lint warnings.