Fix collections compatibility