Speed fixes.