Fix main issues from #220