More general corrections (Michael's notes)

WEBSITE-1078