fixed typestore issues