Changes to eputil functions.