Some fix's for Github