Patches to make debugger and projects work