More LERP fixes