drift fixes