Corrections for issue 2.