Base: On-The-Go: Several rebase fixes