BAC-1004: additional fixes - use only local files