Fixed resource references (master logged deprecation warnings)
(again)