Some patches to LinearContainer. Some more issues