New Zealand captain Kane Williamson said his hamstring is fine but a "frustrating" elbow issue will need to be managed through the Twenty20 World Cup.
Williamson missed Sunrisers Hyderabad's last match against Mumbai Indians in the Indian Premier League last week after a hamstring strain but has been bothered by an elbow tendon injury through the year.
"The hamstring is minor, it's progressing nicely, so not too many concerns and we've still got plenty of time," Williamson told reporters from New Zealand's base in Dubai.
"So hopefully in the next sort of few days or so, I'm taking basically full part in the training. So, it's all good."
Williamson will lead New Zealand's bid for a first Twenty20 World Cup title when they begin their campaign against Pakistan on October 26.
Williamson took time off after New Zealand won the inaugural World Test Championship and said that while the elbow had yet to fully recover it was unlikely to stop him playing a full part in the T20 tournament in the United Arab Emirates and Oman.
"It's been frustrating, certainly when it was at its worst," he said.
"Just the harder you grip and the further you extend, it seems to be quite disruptive.
"There's been a lot of improvement over the last three months, which is good. It's really been a focus and I'm now at a stage where I'm largely able to get through with some comfort.
"There is some load management going on and things just to keep helping it, but I certainly have the intention of taking a full part."