Container and Entity fixes