Eliminate ResourceWarnings on 3.x