Resource usage
Resource usage
A few resource fixes