github issues fixes
github issues fixes