Bug fixes for common docs theme