Fixes on resource monitoring