Resources fixes