Minor cosmetic
Minor fixes