Fixes with project