FERM-29: Fixing paths