Corrections and upgrades