fix type inconsistences