Fixes for intermine/intermine#394