Fixed some Integer issues