Wheat Crash Fix and Roofing fix