fixes after git screwed up the merge