Resource fixes!