Fixes, and extra debug