Fixerup

Fixing things missed while rebasing.