diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9289a2b..9ac0a66 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -27,7 +27,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['8.1']
 
     steps:
       - name: Checkout
diff --git a/src/UuidModel.php b/src/UuidModel.php
index 951c545..4ff788b 100644
--- a/src/UuidModel.php
+++ b/src/UuidModel.php
@@ -4,6 +4,8 @@
 
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Model;
+use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Validation\ValidationInterface;
 use Michalsn\Uuid\Exceptions\UuidModelException;
 use Michalsn\Uuid\Uuid;
 
@@ -281,7 +283,7 @@ protected function doFindColumn(string $columnName)
 	 *
 	 * @return array
 	 */
-	protected function doFindAll(int $limit = 0, int $offset = 0)
+	protected function doFindAll(int $limit = null, int $offset = 0)
 	{
 		$result = parent::doFindAll($limit, $offset);
 		// Convert UUID fields from byte if needed