Fixes on smoothness feature