Couple of more fixes for misc::statistics::limn::data::generate refactor

Change-Id: I7f3851a149ff8ec8073930d43f6bf7e35b9bbdcc