fix properties + paths