Design Issue Fixes