Adding polling waits for timing issues