Fixing some eval/$@ issues