fix up some eval functions