fix issues after merging with master