More markup fixes for SCAN.