changes to make intel compiler work
changes fix ADL problems