Fix #33 - bgpicker bug fixes