Patch 3.
* Fixed some old code.