Fixing more paths