Minor fixes and cleaning