Fixing Github's errors Q.Q

The next merge is going to be a pain in the ass.