Some more problems.

Fixes #3