diff --git a/internal/api/client/account/statuses.go b/internal/api/client/account/statuses.go
index c4c5f67ee..7ecf3ba9f 100644
--- a/internal/api/client/account/statuses.go
+++ b/internal/api/client/account/statuses.go
@@ -152,7 +152,7 @@ func (m *Module) AccountStatusesGETHandler(c *gin.Context) {
 	limit := 30
 	limitString := c.Query(LimitKey)
 	if limitString != "" {
-		i, err := strconv.ParseInt(limitString, 10, 64)
+		i, err := strconv.ParseInt(limitString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", LimitKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
diff --git a/internal/api/client/admin/emojisget.go b/internal/api/client/admin/emojisget.go
index 7c44f45d4..0b7cfe059 100644
--- a/internal/api/client/admin/emojisget.go
+++ b/internal/api/client/admin/emojisget.go
@@ -146,7 +146,7 @@ func (m *Module) EmojisGETHandler(c *gin.Context) {
 	limit := 50
 	limitString := c.Query(LimitKey)
 	if limitString != "" {
-		i, err := strconv.ParseInt(limitString, 10, 64)
+		i, err := strconv.ParseInt(limitString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", LimitKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
diff --git a/internal/api/client/blocks/blocksget.go b/internal/api/client/blocks/blocksget.go
index a35e4548a..98f5ce6ea 100644
--- a/internal/api/client/blocks/blocksget.go
+++ b/internal/api/client/blocks/blocksget.go
@@ -120,7 +120,7 @@ func (m *Module) BlocksGETHandler(c *gin.Context) {
 	limit := 20
 	limitString := c.Query(LimitKey)
 	if limitString != "" {
-		i, err := strconv.ParseInt(limitString, 10, 64)
+		i, err := strconv.ParseInt(limitString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", LimitKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
diff --git a/internal/api/client/favourites/favouritesget.go b/internal/api/client/favourites/favouritesget.go
index 8ba20215d..5ff032b9a 100644
--- a/internal/api/client/favourites/favouritesget.go
+++ b/internal/api/client/favourites/favouritesget.go
@@ -102,7 +102,7 @@ func (m *Module) FavouritesGETHandler(c *gin.Context) {
 	limit := 20
 	limitString := c.Query(LimitKey)
 	if limitString != "" {
-		i, err := strconv.ParseInt(limitString, 10, 64)
+		i, err := strconv.ParseInt(limitString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", LimitKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
diff --git a/internal/api/client/notification/notificationsget.go b/internal/api/client/notification/notificationsget.go
index 94ea6dbd9..d6b3f5162 100644
--- a/internal/api/client/notification/notificationsget.go
+++ b/internal/api/client/notification/notificationsget.go
@@ -123,7 +123,7 @@ func (m *Module) NotificationsGETHandler(c *gin.Context) {
 	limit := 20
 	limitString := c.Query(LimitKey)
 	if limitString != "" {
-		i, err := strconv.ParseInt(limitString, 10, 64)
+		i, err := strconv.ParseInt(limitString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", LimitKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
diff --git a/internal/api/client/search/searchget.go b/internal/api/client/search/searchget.go
index b3da2640d..7026213ac 100644
--- a/internal/api/client/search/searchget.go
+++ b/internal/api/client/search/searchget.go
@@ -109,7 +109,7 @@ func (m *Module) SearchGETHandler(c *gin.Context) {
 	limit := 2
 	limitString := c.Query(LimitKey)
 	if limitString != "" {
-		i, err := strconv.ParseInt(limitString, 10, 64)
+		i, err := strconv.ParseInt(limitString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", LimitKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
@@ -127,7 +127,7 @@ func (m *Module) SearchGETHandler(c *gin.Context) {
 	offset := 0
 	offsetString := c.Query(OffsetKey)
 	if offsetString != "" {
-		i, err := strconv.ParseInt(offsetString, 10, 64)
+		i, err := strconv.ParseInt(offsetString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", OffsetKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
diff --git a/internal/api/client/timeline/home.go b/internal/api/client/timeline/home.go
index 5349f8c5f..e6135dd63 100644
--- a/internal/api/client/timeline/home.go
+++ b/internal/api/client/timeline/home.go
@@ -142,7 +142,7 @@ func (m *Module) HomeTimelineGETHandler(c *gin.Context) {
 	limit := 20
 	limitString := c.Query(LimitKey)
 	if limitString != "" {
-		i, err := strconv.ParseInt(limitString, 10, 64)
+		i, err := strconv.ParseInt(limitString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", LimitKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
diff --git a/internal/api/client/timeline/public.go b/internal/api/client/timeline/public.go
index a2e1faf59..fda23438b 100644
--- a/internal/api/client/timeline/public.go
+++ b/internal/api/client/timeline/public.go
@@ -153,7 +153,7 @@ func (m *Module) PublicTimelineGETHandler(c *gin.Context) {
 	limit := 20
 	limitString := c.Query(LimitKey)
 	if limitString != "" {
-		i, err := strconv.ParseInt(limitString, 10, 64)
+		i, err := strconv.ParseInt(limitString, 10, 32)
 		if err != nil {
 			err := fmt.Errorf("error parsing %s: %s", LimitKey, err)
 			api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
diff --git a/testrig/db.go b/testrig/db.go
index 83f575a02..6670b91db 100644
--- a/testrig/db.go
+++ b/testrig/db.go
@@ -83,7 +83,7 @@ func NewTestDB() db.DB {
 	}
 
 	if alternateDBPort := os.Getenv("GTS_DB_PORT"); alternateDBPort != "" {
-		port, err := strconv.ParseInt(alternateDBPort, 10, 64)
+		port, err := strconv.ParseUint(alternateDBPort, 10, 16)
 		if err != nil {
 			panic(err)
 		}