fixed some inconsistent types