Some bug fixes relationated with millions & tests related with it.