Integer issues fixed