Small fixes after the merge