Apply guessit fixes

And than we can use just one repo