Fixing some minor debug-bugs on this branch