Fix some sudden jumps problems