Fix compalition issues