fix some more usages of int ep numbers;