Minor init updates