collections: optimize
basetypes: fix