- Sharing fixes