Minor Bug Fixes
Minor Bug Fix Merge