Several Fixes
Several Fixes