Shared dataset tweaks