Fix container code generation