Minor: more little stability improvements

Hell, you can now even integrate on Google.