Local paths removed + minor fixes
EN-2434: minor fixes + refactoring