Minor improvements

Fixes #1.