Several Fixes
Minor changes