Some small changes in container and nodes