fixing some issues opened in github