Various cleanup.