Some more fixes after merging