Small fixes in smoother