Fixes after merging