diff --git a/.storybook/preview.js b/.storybook/preview.js
index e20f8eb0..c6941510 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -13,11 +13,11 @@ addDecorator(story => (
         <CRow> 
             <CCol lg="12" xs="12">
                 <CCard lg="12" xs="12"> 
-                    <h1 class="ml-3">CoreUI</h1>
+                    <h1 className="ml-3">CoreUI</h1>
                 </CCard>
             </CCol>
             {story()}
         </CRow>
     </CContainer>
   </>
-));
\ No newline at end of file
+));
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6b05b97..38a1cad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [3.3.6](https://github.com/coreui/coreui-react/compare/3.3.5...3.3.6)
+
+> 10 December 2020
+
+- fix(CWidgetBrand): addHeaderClass bad PropTypes [`d2c102b`](https://github.com/coreui/coreui-react/commit/d2c102b50f0b15a89a2a66334923798b267ddeea)
+- fix(stories): className [`ab3348a`](https://github.com/coreui/coreui-react/commit/ab3348a5aac8eb008c23a5cc6292a7836353a311)
+
 #### [3.3.5](https://github.com/coreui/coreui-react/compare/3.3.4...3.3.5)
 
 > 9 December 2020
diff --git a/package.json b/package.json
index cfdeef55..eefe37fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coreui/react",
-  "version": "3.3.5",
+  "version": "3.3.6",
   "description": "CoreUI React Bootstrap 4 components",
   "license": "MIT",
   "author": {
diff --git a/src/toast/tests/CToast.test.js b/src/toast/tests/CToast.test.js
index 73555a2c..a5407a26 100644
--- a/src/toast/tests/CToast.test.js
+++ b/src/toast/tests/CToast.test.js
@@ -1,7 +1,8 @@
 import React from 'react'
 import { configure, mount } from 'enzyme'
 import Adapter from 'enzyme-adapter-react-16'
-import renderer from 'react-test-renderer';
+import { create } from 'react-test-renderer';
+import { act } from 'react-dom/test-utils';
 
 import CToast from '../CToast'
 import CToaster from '../CToaster'
@@ -10,12 +11,12 @@ configure({ adapter: new Adapter() })
 
 describe('CToast', () => {
   it('renders basic wrapper correctly', () => {
-    const component = renderer.create(<CToast/>);
+    const component = create(<CToast/>);
     let tree = component.toJSON();
     expect(tree).toMatchSnapshot()
   })
   it('renders customized wrapper correctly', () => {
-    const componentCustomized = renderer.create(
+    const componentCustomized = create(
       <CToast
         className='class-name'
         show
@@ -44,7 +45,9 @@ describe('CToast', () => {
         </CToast>
       </CToaster>
     );
-    jest.runAllTimers()
+    act(() => {
+      jest.runAllTimers()
+    })
     console.log(component.html());
     expect(component.find(<CToast/>)).toHaveLength(0);
   })
@@ -64,8 +67,10 @@ describe('CToast', () => {
         </CToast>
       </CToaster>
     );
-    jest.runAllTimers()
+    act(() => {
+      jest.runAllTimers()
+    })
     console.log(component.html());
     expect(component.find(<CToast/>)).toHaveLength(0);
   })
-})
\ No newline at end of file
+})
diff --git a/src/widgets/CWidgetBrand.js b/src/widgets/CWidgetBrand.js
index 0ea0894c..0f9932e2 100644
--- a/src/widgets/CWidgetBrand.js
+++ b/src/widgets/CWidgetBrand.js
@@ -73,7 +73,7 @@ CWidgetBrand.propTypes = {
   rightFooter: PropTypes.string,
   leftHeader: PropTypes.string,
   leftFooter: PropTypes.string,
-  addHeaderClasses: PropTypes.oneOfType([String, Array, Object]),
+  addHeaderClasses: PropTypes.oneOfType([PropTypes.string, PropTypes.array, PropTypes.object]),
   bodySlot: PropTypes.node
 };
 
diff --git a/stories/CWidgetBrand.stories.js b/stories/CWidgetBrand.stories.js
index fccf3b01..463b921a 100644
--- a/stories/CWidgetBrand.stories.js
+++ b/stories/CWidgetBrand.stories.js
@@ -40,7 +40,7 @@ return <>
           leftHeader={leftHeader}
           leftFooter={leftFooter}
         >
-          <p class="m-4">Some brand</p>
+          <p className="m-4">Some brand</p>
         </CWidgetBrand>
       </CCardBody>
     </CCard>
diff --git a/stories/CWidgetDropdown.stories.js b/stories/CWidgetDropdown.stories.js
index dc16dcf4..905b1913 100644
--- a/stories/CWidgetDropdown.stories.js
+++ b/stories/CWidgetDropdown.stories.js
@@ -42,7 +42,7 @@ return <>
           text={_text}
         >
           <CDropdown
-            class="float-right"
+            className="float-right"
             color="transparent p-0"
             placement="bottom-end"
           >