Errors corrected in core after real case tests.