Fixes after rebasing.