Debugging fixups