FIx path bugs