Fixes.

See #17 and #14 .