Several Fixes