eval script fixes