Fix rebase filesystem