Updated raccoon fixes