Fix #1133 - gdbr warnings, and some other