Fix issues from #11