Bugfixes found while canonizing Alexa top 1M.