A few further changes towards algorithm picking