Minor fixes
Minor fixes & cleanup