Some fixes for the debug configuration