Update of the project module to fix small issues