Fix path helpers