Issue Fixes

Issue Fixes