Correct issues during whitelist generation which prevented correct list generation