Minor Fixes to algorithm selection