Yet more debug edits