Fixed incorrect delegate/datasource relationships