Minor fixes
Minor tweaks