Somes fix's for Github