Minor init changes.