data object fixes