Corrections and fixes