Asset delivery and some data object fixes