Fix crash and other simple things.