source-sharing tweaks