[REBASE] fixes