More of BC out of the core.
Either fixed or broke more things.