Fix integer types