diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
index 1815b724f..6c95b386c 100644
--- a/channels/CMakeLists.txt
+++ b/channels/CMakeLists.txt
@@ -18,7 +18,7 @@
 include(CMakeParseArguments)
 include(CMakeDependentOption)
 
-function(define_channel_options)
+macro(define_channel_options)
   set(PREFIX "CHANNEL")
 
   cmake_parse_arguments(
@@ -53,7 +53,7 @@ function(define_channel_options)
   cmake_dependent_option(
     ${CHANNEL_SERVER_OPTION} "${CHANNEL_SERVER_OPTION_DOC}" ${CHANNEL_SERVER_DEFAULT} "${CHANNEL_OPTION}" OFF
   )
-endfunction(define_channel_options)
+endmacro(define_channel_options)
 
 macro(define_channel _channel_name)
   set(CHANNEL_NAME ${_channel_name})
diff --git a/channels/ainput/ChannelOptions.cmake b/channels/ainput/ChannelOptions.cmake
index 9902b790b..5bab1c8d8 100644
--- a/channels/ainput/ChannelOptions.cmake
+++ b/channels/ainput/ChannelOptions.cmake
@@ -1,4 +1,4 @@
-set(OPTION_DEFAULT OFF)
+set(OPTION_DEFAULT ON)
 set(OPTION_CLIENT_DEFAULT ON)
 set(OPTION_SERVER_DEFAULT ON)
 
diff --git a/libfreerdp/locale/keyboard.c b/libfreerdp/locale/keyboard.c
index c938f7201..ad46683c0 100644
--- a/libfreerdp/locale/keyboard.c
+++ b/libfreerdp/locale/keyboard.c
@@ -361,11 +361,11 @@ FREERDP_REMAP_TABLE* freerdp_keyboard_remap_string_to_list(const char* list)
 	if (!list)
 		return remap_table;
 
+	BOOL success = FALSE;
 	char* copy = _strdup(list);
 	if (!copy)
 		goto fail;
 
-	BOOL success = FALSE;
 	char* context = NULL;
 	char* token = strtok_s(copy, ",", &context);
 	while (token)