Resources refactor fixes