Fixes in ResourcesManager