Fixing thrust and friction calcs