fixed some type inconsistencies