Fixed bugs introduced when trying to change container return types.