Improve path fix for manual install