address-bg fixes