WIP fix some failures, add extra debug info