a few fixes after the merge