Fixing addon toc bugs.