Fix small issues

Prevents #2