Changes needed for *firetray in order to keep building"