Fix spec, and fix export option