few init fixes