Fixes for files that do not contain a container tag