Fix oopses in previous commits
Bump version to 0.2