Corrections after some testing