Fixed some of #88