Tweaks to get new BLAST working