Fixes for new resources changes