Fix github issues