More corrections and fixes