Fixes and support for custom sidebars.