More fixes for path