Some minor fixes
Minor fixes