Fix some Scruntizer issues