Small fixes before tagging

This issue was really fixed in earlier commit.

Fixes #1