Speed and normal fixes in two-part model