Various tweaks and fixes for project deletion