Corrections and further fixes