Corrections up to implementation