Some more path fix