some fixes for path