Added more wait to fix sync issues

Signed-off-by: Nishtha Agarwal <nnishtha.agarwal@gmail.com>