Small fixes

Links to article from #8