GatewayContainer: some bugfixes