Smoothing fixes;