Rebase/fix for rebasing errors