Fixes for some eval stuff...