some minor fixes after merging with master