More 3.1 fixes for DataObjects and Forms