Various Issue Fixes