Fix for generating correct container types