Envaux changes for gdb stuff