More bigfoot fixes