Fixes for smoothState
More fixes