Fixes, correct debug output