diff --git a/xfce-xterm-launcher-update b/xfce-xterm-launcher-update
index d1b4c61..f5956aa 100755
--- a/xfce-xterm-launcher-update
+++ b/xfce-xterm-launcher-update
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+use v5.24; # for postderef
 use warnings;
 use strict;
 use File::Slurp;
@@ -21,7 +22,7 @@ for (@desktop_files) {
 
 my @xterm_scripts = glob("$ENV{HOME}/bin/hosts/*");
 @xterm_scripts = sort { -A $a <=> -A $b } @xterm_scripts;
-@xterm_scripts = @xterm_scripts[0..31];
+@xterm_scripts = @xterm_scripts[0..31] if @xterm_scripts > 32;
 for my $xterm_script (@xterm_scripts) {
     my ($name) = $xterm_script =~ m{([^/]+)$};
     if ($desktop_files{$name}) {
@@ -98,7 +99,7 @@ sub replace {
     }
     open(my $fh, '>', $filename);
     print $fh "[Desktop Entry]\n";
-    for my $k (sort keys $desktop_file->{content_fields}) {
+    for my $k (sort keys $desktop_file->{content_fields}->%*) {
         print $fh "$k=$desktop_file->{content_fields}{$k}\n";
     }
     close($fh);