Scotland fly-half Ruaridh Jackson feels they are in good shape as they prepare to face South Africa on Sunday despite his side surviving a scare against Japan.
The Scots ran out 42-17 winners over the Cherry Blossoms at Murrayfield on Saturday but they struggled to get going in the first half on a heavy pitch which has been affected by a worm infestation.
An 11-3 half-time advantage for Scotland was cut to just one point as Kenki Fukuoka went over for the first of two tries in quick succession.
Scotland recovered to cross for six tries in total and Jackson feels they will not be caught out the same way when take on the Springboks this weekend.
"It was our first game so there is maybe going to be a bit of rust. They came at us pretty hard, especially at the start of the second half," he said.
"But once we ironed out a few problems we played some really good stuff and scored some great tries.
"To get six tries is a great achievement but there are definitely things we need to work on. We gave them two relatively soft tries.
"We reacted well from that but we want to play that rugby from the off and not wait until the final half-hour.
"We maybe came out a bit flat at the start of the second half and they gave us a bit of a shock. We reacted well to it but we need to be at a higher level when we come out.
"It was always going to be tough and they are a really good team. They play some really good rugby and they put us under a lot of pressure.
"But it puts us in a good position. There are things to work on and there are positives, so we are in a pretty good place right now."