Issues Fixes