Minor sharing tweaks