diff --git a/linode/firewall/framework_models.go b/linode/firewall/framework_models.go
index 04f301d3e..4e91e1cac 100644
--- a/linode/firewall/framework_models.go
+++ b/linode/firewall/framework_models.go
@@ -374,7 +374,7 @@ func FlattenFirewallRules(
 	}
 
 	for i := range knownRules {
-		if i > len(rules) {
+		if i >= len(rules) {
 			break
 		}
 
diff --git a/linode/image/framework_resource.go b/linode/image/framework_resource.go
index 0f7724c65..add52f4e1 100644
--- a/linode/image/framework_resource.go
+++ b/linode/image/framework_resource.go
@@ -532,6 +532,13 @@ func replicateImage(
 		var replicaRegionWaitList []string
 
 		image, err = client.GetImage(ctx, imageID)
+		if err != nil {
+			diags.AddError(
+				fmt.Sprintf("Failed to get image %v", imageID),
+				err.Error(),
+			)
+			return nil, diags
+		}
 		for _, region := range image.Regions {
 			// remove pending deletion replicas from the wait list
 			if region.Status != linodego.ImageRegionStatusPendingDeletion {
diff --git a/linode/objkey/framework_model.go b/linode/objkey/framework_model.go
index fb2493271..0507df513 100644
--- a/linode/objkey/framework_model.go
+++ b/linode/objkey/framework_model.go
@@ -163,7 +163,7 @@ func FlattenBucketAccessEntries(
 	}
 
 	for i := range resultEntries {
-		if i > len(entries) {
+		if i >= len(entries) {
 			break
 		}
 
diff --git a/linode/rdns/framework_resource.go b/linode/rdns/framework_resource.go
index 9cc8a72d2..4a3467851 100644
--- a/linode/rdns/framework_resource.go
+++ b/linode/rdns/framework_resource.go
@@ -182,16 +182,7 @@ func (r *Resource) Update(
 
 	client := r.Meta.Client
 
-	var updateOpts linodego.IPAddressUpdateOptions
-
-	resourceUpdated := false
-
 	if !state.RDNS.Equal(plan.RDNS) {
-		updateOpts.RDNS = plan.RDNS.ValueStringPointer()
-		resourceUpdated = true
-	}
-
-	if resourceUpdated {
 		ip, err := updateIPAddress(
 			ctx,
 			client,