Fixing stuff for Github