Minor Bug Fixes
Minor bugs fix