Tweak the core components