Fixes overlooked in rebase