Some more path fixes