Minor fixes. Cleanups.