Small interim fixes
Can compute whether picks are needed. Small fixes.