Fix collections fallout and some warnings