More fun fixes until the North Faculty Atrium