diff --git a/lib/ember-w-pack/addon/components/w-async.js b/lib/ember-w-pack/addon/components/w-async.js
index bde2dde2b..54f8b1c5c 100644
--- a/lib/ember-w-pack/addon/components/w-async.js
+++ b/lib/ember-w-pack/addon/components/w-async.js
@@ -6,7 +6,7 @@ export default class WAsyncComponent extends Component {
   layout = layout
   
   didReceiveAttrs() {
-    this._super(...arguments);
+    super.init(...arguments);
     if (this.autoFire) this.task.perform();
   }
 
diff --git a/lib/ember-w-pack/addon/components/w-pagination.js b/lib/ember-w-pack/addon/components/w-pagination.js
index 9d50cc436..5c0271c51 100644
--- a/lib/ember-w-pack/addon/components/w-pagination.js
+++ b/lib/ember-w-pack/addon/components/w-pagination.js
@@ -46,7 +46,7 @@ export default class WPaginationComponent extends Component {
     
 
   didReceiveAttrs() {
-    this._super(...arguments);
+    super.init(...arguments);
     const length = this.pages;
     this.set(
       "pagesArray",
diff --git a/lib/ember-w-pack/addon/templates/components/w-async.hbs b/lib/ember-w-pack/addon/templates/components/w-async.hbs
index a17227452..04365b364 100644
--- a/lib/ember-w-pack/addon/templates/components/w-async.hbs
+++ b/lib/ember-w-pack/addon/templates/components/w-async.hbs
@@ -1,9 +1,9 @@
-{{#if showLoader}}
-  {{#if loaderComponent}}
-    {{loaderComponent}}
+{{#if @showLoader}}
+  {{#if @loaderComponent}}
+    <loaderComponent></loaderComponent>
   {{else}}
     Loading...
   {{/if}}
 {{else}}
-  {{yield task.last.value}}
+  {{yield @task.last.value}}
 {{/if}}
\ No newline at end of file
diff --git a/lib/ember-w-pack/addon/templates/components/w-pagination.hbs b/lib/ember-w-pack/addon/templates/components/w-pagination.hbs
index 36737ec87..2d4dc9738 100644
--- a/lib/ember-w-pack/addon/templates/components/w-pagination.hbs
+++ b/lib/ember-w-pack/addon/templates/components/w-pagination.hbs
@@ -1,13 +1,13 @@
-{{#if showComponent}} 
+{{#if @showComponent}} 
 <div class="t-align-c mt-3 bold">
-  <button disabled="{{if disabledPrevious 'disabled'}}" {{action 'previousPage'}}>
+  <button type="button" disabled="{{if @disabledPrevious 'disabled'}}" {{on 'previousPage'}}>
     &lt; Prev
   </button>
   <span class="dark-grey mx-4">
     {{this.start}}-{{this.end}} of {{this.numberOfTotalResults}}
   </span>
   
-  <button disabled="{{if disabledNext 'disabled'}}" {{action 'nextPage'}}>
+  <button type="button" disabled="{{if @disabledNext 'disabled'}}" {{on 'nextPage'}}>
     Next &gt;
   </button>
   
diff --git a/lib/ember-w-pack/addon/templates/components/w-tab-nav.hbs b/lib/ember-w-pack/addon/templates/components/w-tab-nav.hbs
index 096c886a5..2fdeef6ce 100644
--- a/lib/ember-w-pack/addon/templates/components/w-tab-nav.hbs
+++ b/lib/ember-w-pack/addon/templates/components/w-tab-nav.hbs
@@ -1,6 +1,7 @@
-<div class="tab-nav-underline w-100 justify-content-start t-align-c {{tabClass}}">
-  {{#each @tabs as |tab index|}}
-    <div class="tab px-0 mr-md-5 mr-sm-4 mr-3 font-sm bold {{if (eq tab activeTab) 'active' inactiveClass}}" {{on "click" (action @onTabChange tab)}}>{{tab.name}}</div>
+<div class="tab-nav-underline w-100 justify-content-start t-align-c {{@tabClass}}">
+  {{#each @tabs as |tab|}}
+    <div class="tab px-0 mr-md-5 mr-sm-4 mr-3 font-sm bold {{if (eq tab @activeTab) 'active' @inactiveClass}}" 
+    {{on "click" (on @onTabChange tab)}} role="button">{{tab.name}}</div>
   {{/each}}
 </div>
 <div>