Fix bubble issues.