Fixes after merging with master