fixed some incompatible types