[TIDOC-1033] Fix some random issues causing warning message to appear