Fix various errors reported by squash.