Add some debug support code