Fix some silly bugs in the pick activity