Partial fixes for the "project" module