Pass the overrides to the ContextBuilder

Previously the overrides were not actually used.