Add some more CONFIG_* prefixes that were missing.