Patches for the discourse_project