Cosmetics
Minor fixes