Some small fixes from #19