Resource usage tweaks