Fixes in pickers and in the bond handling