Small fixes
Minor fixes