Minor fixes
SHS-1477
Fix broken paths organizations error