Fixed some github issues