Fixes after rebasing master.