More share checks

Fixes #290