more init fixes