Fix issues on Github (1-3)