Fix remaining code compliance violations.