Fix paths and place ownership change to last