Disable Share & fix other issues