Fixes facehuger bugs
Merge pull request #5915 from tkdrg/hugs

Fixes a couple facehugger bugs