Few corrections and some more in numa section