Fixed 2 cases of flickering.