Bugfixes

Some bugfixes, possibly caused by updates to datapackage format.