Trying to bullet-proof all the github stuff