Fix inconsistent types for extracted numbers