Small Issue Fixes