Fix bugs introduced with the block-based data model initializer