more fixes after merging