Resources addon fixes