Cleanups done while debugging some errors.