Small fixes with project