Minor fixes
Minor fixes