diff --git a/addon/components/page-item.js b/addon/components/page-item.js
index 208935b..4088541 100644
--- a/addon/components/page-item.js
+++ b/addon/components/page-item.js
@@ -7,7 +7,7 @@ export default Component.extend({
   seperator: '…',
   selected: null,
 
-  url: computed('urlTemplate', 'page', function () {
+  url: computed('firstPage', 'firstPageUrlTemplate', 'page', 'urlTemplate', function () {
     let urlTemplate = this.urlTemplate;
     let current = this.page;
     let firstPage = this.firstPage;
@@ -30,7 +30,7 @@ export default Component.extend({
     }
   }),
 
-  isDots: computed('page', function () {
+  isDots: computed('page', 'seperator', function () {
     let seperator = this.seperator;
     let page = this.page;
 
diff --git a/addon/components/pagination-pager.js b/addon/components/pagination-pager.js
index 95058ac..78c8af5 100644
--- a/addon/components/pagination-pager.js
+++ b/addon/components/pagination-pager.js
@@ -23,7 +23,7 @@ export default Component.extend({
   firstPageUrlTemplate: null,
   lastPage: alias('count'),
 
-  previousUrl: computed('urlTemplate', 'current', 'firstPage', function () {
+  previousUrl: computed('current', 'firstPage', 'firstPageUrlTemplate', 'urlTemplate', function () {
     let urlTemplate = this.urlTemplate;
     let current = this.current;
     let firstPage = this.firstPage;
@@ -57,7 +57,7 @@ export default Component.extend({
     return urlTemplate;
   }),
 
-  firstUrl: computed('urlTemplate', 'current', 'firstPage', function () {
+  firstUrl: computed('current', 'firstPage', 'firstPageUrlTemplate', 'urlTemplate', function () {
     let urlTemplate = this.urlTemplate;
     let firstPage = this.firstPage;
     let firstPageUrlTemplate = this.firstPageUrlTemplate;
@@ -84,7 +84,7 @@ export default Component.extend({
     return Number(this.current);
   }),
 
-  paginationSizeClass: computed('paginationSize', function () {
+  paginationSizeClass: computed('pager', 'paginationSize', 'size', function () {
     let size = this.size;
     let pager = this.pager;
 
@@ -93,7 +93,7 @@ export default Component.extend({
       : '';
   }),
 
-  isFirst: computed('firstPage', 'current', function () {
+  isFirst: computed('current', 'currentPage', 'firstPage', function () {
     let currentPage = parseInt(this.currentPage);
     let firstPage = parseInt(this.firstPage);
 
@@ -102,7 +102,7 @@ export default Component.extend({
 
   isFirstDisabled: or('disabled', 'isFirst'),
 
-  isLast: computed('lastPage', 'current', function () {
+  isLast: computed('current', 'currentPage', 'lastPage', function () {
     let currentPage = parseInt(this.currentPage);
     let lastPage = parseInt(this.lastPage);
 
@@ -119,7 +119,7 @@ export default Component.extend({
     return hide || (autoHide && (!count || count <= 1));
   }),
 
-  pages: computed('count', 'current', 'countOut', 'countIn', function () {
+  pages: computed('count', 'countIn', 'countOut', 'current', 'seperator', function () {
     let seperator = this.seperator;
     let current = this.current;
     let count = this.count;
diff --git a/package.json b/package.json
index ee4cf5f..336c66a 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "build": "ember build --environment=production",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
     "lint:hbs": "ember-template-lint .",
-    "lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
+    "lint:js": "eslint ./*.js addon app config tests",
     "start": "ember serve",
     "test": "npm-run-all lint:* test:*",
     "test:ember": "ember test",