Fix bg-bicker errors