diff --git a/src/knot/conf/schema.c b/src/knot/conf/schema.c
index 053620915f2ad545548e2187871e13d51cf15345..9a3f8018323389d516f1e6baa45a4bc38a4fb24f 100644
--- a/src/knot/conf/schema.c
+++ b/src/knot/conf/schema.c
@@ -262,9 +262,9 @@ static const yp_item_t desc_policy[] = {
 	{ C_ZONEFILE_SYNC,       YP_TINT,  YP_VINT = { -1, INT32_MAX, 0, YP_STIME } }, \
 	{ C_ZONE_IN_JOURNAL,     YP_TBOOL, YP_VNONE }, \
 	{ C_IXFR_DIFF,           YP_TBOOL, YP_VNONE }, \
-	{ C_MAX_ZONE_SIZE,       YP_TINT,  YP_VINT = { 0, INT64_MAX, INT64_MAX, YP_SSIZE }, FLAGS }, \
-	{ C_MAX_JOURNAL_USAGE,   YP_TINT,  YP_VINT = { KILO(40), INT64_MAX, MEGA(100), YP_SSIZE } }, \
-	{ C_MAX_JOURNAL_DEPTH,   YP_TINT,  YP_VINT = { 2, INT64_MAX, INT64_MAX } }, \
+	{ C_MAX_ZONE_SIZE,       YP_TINT,  YP_VINT = { 0, SSIZE_MAX, SSIZE_MAX, YP_SSIZE }, FLAGS }, \
+	{ C_MAX_JOURNAL_USAGE,   YP_TINT,  YP_VINT = { KILO(40), SSIZE_MAX, MEGA(100), YP_SSIZE } }, \
+	{ C_MAX_JOURNAL_DEPTH,   YP_TINT,  YP_VINT = { 2, SSIZE_MAX, SSIZE_MAX } }, \
 	{ C_DNSSEC_SIGNING,      YP_TBOOL, YP_VNONE, FLAGS }, \
 	{ C_DNSSEC_POLICY,       YP_TREF,  YP_VREF = { C_POLICY }, FLAGS, { check_ref_dflt } }, \
 	{ C_SERIAL_POLICY,       YP_TOPT,  YP_VOPT = { serial_policies, SERIAL_POLICY_INCREMENT } }, \
@@ -276,7 +276,7 @@ static const yp_item_t desc_policy[] = {
 	{ C_COMMENT,             YP_TSTR,  YP_VNONE }, \
 	/* Obsolete, old journal items. */ \
 	{ C_JOURNAL,             YP_TSTR,  YP_VNONE, FLAGS }, \
-	{ C_MAX_JOURNAL_SIZE,    YP_TINT,  YP_VINT = { 0, INT64_MAX, INT64_MAX, YP_SSIZE }, FLAGS }, \
+	{ C_MAX_JOURNAL_SIZE,    YP_TINT,  YP_VINT = { 0, SSIZE_MAX, SSIZE_MAX, YP_SSIZE }, FLAGS }, \
 
 static const yp_item_t desc_template[] = {
 	{ C_ID, YP_TSTR, YP_VNONE, CONF_IO_FREF },
diff --git a/src/knot/updates/zone-update.c b/src/knot/updates/zone-update.c
index c5625bf4bce5bdc7400e9e98ad46f4bb0cfb397b..2e150e4e10a8cbc13b43911b5f1586cf960cefeb 100644
--- a/src/knot/updates/zone-update.c
+++ b/src/knot/updates/zone-update.c
@@ -608,7 +608,7 @@ int zone_update_commit(conf_t *conf, zone_update_t *update)
 
 	/* Check the zone size. */
 	conf_val_t val = conf_zone_get(conf, C_MAX_ZONE_SIZE, update->zone->name);
-	int64_t size_limit = conf_int(&val);
+	size_t size_limit = conf_int(&val);
 
 	if (new_contents->size > size_limit) {
 		/* Recoverable error. */