Fix bad path hacks