Clean up some debug info and fix derps