Small fixes to allow crawling