More work on supporting gdb