Several small changes in resource fetching and compatibility