some init fixes