Deal with full paths