Fixes to use with WC

See #24 for discussion