Fixes for changes in opendata