fixes for icfp2014