Minor init improvements from 6.8