diff --git a/boards/tiac/magpie_f777ni/Kconfig.defconfig b/boards/tiac/magpie_f777ni/Kconfig.defconfig
index a6411e5d8a..2e86788c3e 100644
--- a/boards/tiac/magpie_f777ni/Kconfig.defconfig
+++ b/boards/tiac/magpie_f777ni/Kconfig.defconfig
@@ -6,11 +6,6 @@
 
 if BOARD_MAGPIE_F777NI
 
-choice COUNTER_RTC_STM32_CLOCK_SRC
-	default COUNTER_RTC_STM32_CLOCK_LSE
-	depends on COUNTER
-endchoice
-
 choice RNG_GENERATOR_CHOICE
 	default ENTROPY_DEVICE_RANDOM_GENERATOR
 	depends on ENTROPY_GENERATOR
diff --git a/modules/ubxlib/Kconfig b/modules/ubxlib/Kconfig
index 4b932572b0..3233e8b47a 100644
--- a/modules/ubxlib/Kconfig
+++ b/modules/ubxlib/Kconfig
@@ -86,7 +86,7 @@ config UBXLIB_TEST
 	bool "Compile the ubxlib tests"
 	select TEST
 	select IRQ_OFFLOAD
-	select CPLUSPLUS
+	select CPP
 	default n
 	help
 	  The self contained ubxlib tests are only useful for
diff --git a/samples/ubx_gnss/README.rst b/samples/ubx_gnss/README.rst
index 00f3298b9d..00431daf10 100644
--- a/samples/ubx_gnss/README.rst
+++ b/samples/ubx_gnss/README.rst
@@ -63,7 +63,7 @@ Build and flash for different boards
 
 .. zephyr-app-commands::
    :zephyr-app: bridle/samples/ubx_gnss
-   :board: nrf9160dk_nrf9160
+   :board: nrf9160dk/nrf9160
    :build-dir: nrf9160dk_nrf9160-ubx_gnss
    :west-args: -p
    :goals: flash
@@ -73,7 +73,7 @@ Build and flash for different boards
 
 .. zephyr-app-commands::
    :zephyr-app: bridle/samples/ubx_gnss
-   :board: nrf52840dk_nrf52840
+   :board: nrf52840dk/nrf52840
    :build-dir: nrf52840dk_nrf52840-ubx_gnss
    :west-args: -p
    :goals: flash
@@ -113,7 +113,7 @@ Build and flash for different boards
 
 .. zephyr-app-commands::
    :zephyr-app: bridle/samples/ubx_gnss
-   :board: mimxrt1170_evkb_cm7
+   :board: mimxrt1170_evk@B/mimxrt1176/cm7
    :build-dir: mimxrt1170_evkb_cm7-ubx_gnss
    :west-args: -p
    :flash-args: -r pyocd
diff --git a/samples/ubx_gnss/prj.conf b/samples/ubx_gnss/prj.conf
index 9de99a1c48..7fabb1a7be 100644
--- a/samples/ubx_gnss/prj.conf
+++ b/samples/ubx_gnss/prj.conf
@@ -28,7 +28,7 @@ CONFIG_UBXLIB_GNSS=y
 
 # Libc
 CONFIG_MINIMAL_LIBC=y
-CONFIG_MINIMAL_LIBC_MALLOC=n
+CONFIG_COMMON_LIBC_MALLOC=n
 
 # Memory
 CONFIG_MAIN_STACK_SIZE=8192