Small fixes.
8% faster