Fix nits and rebase