More corrections, plus sanity checks for missing uniforms.