Fixed Scarab stuff