[FABRIC-848] More fixes on container builder API