Techee patches

Should probably amended to the initial relative path commit.