Fix some debugging mistakes/leftovers