Minor Issues Fixes