Small changes to resource manager