Bugfixes/weak delegate datasource