Additional fixes after rebasing/merging with master.