fixes after merging update