Fix up debugging