diff --git a/Controller/ApiBillController.php b/Controller/ApiBillController.php
index dddecda..b4c7f70 100755
--- a/Controller/ApiBillController.php
+++ b/Controller/ApiBillController.php
@@ -535,15 +535,15 @@ final class ApiBillController extends Controller
      *      'sales_tax_code', 'purchase_tax_code', 'costcenter', 'costobject',
      *      'default_purchase_container', 'default_sales_container',
      *
-     * @param Item            $item    The item object for which the bill element is being created
-     * @param Bill            $bill    The bill object for which the bill element is being created
-     * @param RequestAbstract $request The request object that contains the header account
+     * @param Item        $item    The item object for which the bill element is being created
+     * @param Bill        $bill    The bill object for which the bill element is being created
+     * @param HttpRequest $request The request object that contains the header account
      *
      * @return BillElement
      *
      * @since 1.0.0
      */
-    public function createBaseBillElement(Item $item, Bill $bill, RequestAbstract $request) : BillElement
+    public function createBaseBillElement(Item $item, Bill $bill, HttpRequest $request) : BillElement
     {
         // Handle person tax code for finding tax combination below
         $attr           = new NullAttribute();
diff --git a/Models/SalesBillMapper.php b/Models/SalesBillMapper.php
index 452c678..01aa7f3 100755
--- a/Models/SalesBillMapper.php
+++ b/Models/SalesBillMapper.php
@@ -385,7 +385,7 @@ final class SalesBillMapper extends BillMapper
 
         $hasData = false;
         foreach ($results as $result) {
-            if ($result !== "0" || $result > 0) {
+            if ($result !== '0' || ((int) $result) > 0) {
                 $hasData = true;
                 break;
             }
@@ -434,8 +434,8 @@ final class SalesBillMapper extends BillMapper
 
         $hasData = false;
         foreach ($results as $result) {
-            if ($result['net_sales'] !== "0" || $result['net_sales'] > 0
-                || $result['net_costs'] !== "0" || $result['net_costs'] > 0
+            if ($result['net_sales'] !== '0' || ((int) $result['net_sales']) > 0
+                || $result['net_costs'] !== '0' || ((int) $result['net_costs']) > 0
             ) {
                 $hasData = true;
                 break;