Minor corrections and upgrades