Fix normalization of relative paths going up a few dirs, fixes #1759