Standards compliance fixes