Greater visibility support

Added patches to workaround a few SB import asserts