Fixes
Minor fixes