diff --git a/pw3270.cbp b/pw3270.cbp
index 9a2fe4b..5f8c9a4 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -231,7 +231,6 @@
 		<Unit filename="src/lib3270/ft_dft_ds.h" />
 		<Unit filename="src/lib3270/ft_dftc.h" />
 		<Unit filename="src/lib3270/ftc.h" />
-		<Unit filename="src/lib3270/globals.h" />
 		<Unit filename="src/lib3270/glue.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -267,6 +266,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="src/lib3270/popupsc.h" />
+		<Unit filename="src/lib3270/private.h" />
 		<Unit filename="src/lib3270/proxy.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/src/lib3270/iocalls.c b/src/lib3270/iocalls.c
index 37613c5..36299f7 100644
--- a/src/lib3270/iocalls.c
+++ b/src/lib3270/iocalls.c
@@ -588,10 +588,7 @@ retry:
 
 static int internal_wait(H3270 *hSession, int seconds)
 {
-	time_t end;
-
-	// Alternative wait call
-	end = time(0) + seconds;
+	time_t end = time(0) + seconds;
 
 	while(time(0) < end)
 	{
diff --git a/src/plugins/hllapi/hllapi.c b/src/plugins/hllapi/hllapi.c
index eb5286e..e461dd7 100644
--- a/src/plugins/hllapi/hllapi.c
+++ b/src/plugins/hllapi/hllapi.c
@@ -297,6 +297,54 @@ static int input_string(char *input, unsigned short *length, unsigned short *rc)
 			case 'c':	// PF12
 				hllapi_pfkey(12);
 				break;
+
+			case 'd':	// PF13
+				hllapi_pfkey(13);
+				break;
+
+			case 'e':	// PF14
+				hllapi_pfkey(14);
+				break;
+
+			case 'f':	// PF15
+				hllapi_pfkey(15);
+				break;
+
+			case 'g':	// PF16
+				hllapi_pfkey(16);
+				break;
+
+			case 'h':	// PF17
+				hllapi_pfkey(17);
+				break;
+
+			case 'i':	// PF18
+				hllapi_pfkey(18);
+				break;
+
+			case 'j':	// PF19
+				hllapi_pfkey(19);
+				break;
+
+			case 'k':	// PF20
+				hllapi_pfkey(20);
+				break;
+
+			case 'l':	// PF21
+				hllapi_pfkey(21);
+				break;
+
+			case 'm':	// PF22
+				hllapi_pfkey(22);
+				break;
+
+			case 'n':	// PF23
+				hllapi_pfkey(23);
+				break;
+
+			case 'o':	// PF24
+				hllapi_pfkey(24);
+				break;
 			}
 
 			buffer = ptr;
--
libgit2 0.21.2