Corrections from first test run