0.3.0 bugfixes

Thanks to @tednitz for help on #127