fixed some type