Resource compatibility bugfixes