Some file path improvements