Improve on issue #1 and issue #2.