Some fixes after merging