fixes for jewel/evita