Some meal fixes
NPE fix in ContainerTFC