Container and other fixes