Fixes for the new Resources schema