Quick fixes for CB site.