Minor Rebase Fixes