Bugfix, cleanup.