Minor fixes and cosmetic