More small debug fixes.