fixes for exp machine