Small fixes for Bigfoot