surface/bootstrap: fix Container constructor