Minor fixes after the merge