More eval fixes