small fixes (speed)