Fixing more of the Data Container Writers