tweaks to core modules