few type changes