Another quick corrections patch