More resource fixes