Fix missing and incompatible types