[dq8] Some minor touchups.