Several Fixes for reported QA Errors