Check the container metadata as well for the container type, clean up some cruft