Few improvements to collection extensions