Some speed fixes.