General Fixes
Debug enhancements