Fix bgpicker fallbaks