Minor fixes and cleaning.