Picking fixes