diff --git a/canutils/uavcan/Kconfig b/canutils/uavcan/Kconfig
index 841d5d20f..3103be4ca 100644
--- a/canutils/uavcan/Kconfig
+++ b/canutils/uavcan/Kconfig
@@ -9,7 +9,7 @@ config CANUTILS_UAVCAN
 	depends on STM32_HAVE_CAN1
 	depends on !STM32_CAN1
 	depends on !STM32_CAN2
-	depends on (STM32_HAVE_TIM2 && !STM32_TIM2) || (STM32_HAVE_TIM3 && !STM32_TIM3) || (STM32_HAVE_TIM4 && !STM32_TIM4) || (STM32_HAVE_TIM5 && !STM32_TIM5) || (STM32_HAVE_TIM6 && !STM32_TIM6) || (STM32_HAVE_TIM7 && !STM32_TIM7)
+	depends on !STM32_TIM2 || (STM32_HAVE_TIM3 && !STM32_TIM3) || (STM32_HAVE_TIM4 && !STM32_TIM4) || (STM32_HAVE_TIM5 && !STM32_TIM5) || (STM32_HAVE_TIM6 && !STM32_TIM6) || (STM32_HAVE_TIM7 && !STM32_TIM7)
 	depends on C99_BOOL8
 	depends on HAVE_CXX
 	depends on !DISABLE_POLL
@@ -62,7 +62,7 @@ config UAVCAN_STM32_NUM_IFACES
 
 choice
 	prompt "Timer"
-	default UAVCAN_STM32_TIM2 if STM32_HAVE_TIM2 && !STM32_TIM2
+	default UAVCAN_STM32_TIM2 if !STM32_TIM2
 	default UAVCAN_STM32_TIM3 if STM32_HAVE_TIM3 && !STM32_TIM3
 	default UAVCAN_STM32_TIM4 if STM32_HAVE_TIM4 && !STM32_TIM4
 	default UAVCAN_STM32_TIM5 if STM32_HAVE_TIM5 && !STM32_TIM5
@@ -71,7 +71,7 @@ choice
 
 config UAVCAN_STM32_TIM2
 	bool "TIM2"
-	depends on STM32_HAVE_TIM2 && !STM32_TIM2
+	depends on !STM32_TIM2
 	---help---
 		The library will use TIM2.
 
diff --git a/canutils/uavcan/Makefile b/canutils/uavcan/Makefile
index 19097d322..90551ef95 100644
--- a/canutils/uavcan/Makefile
+++ b/canutils/uavcan/Makefile
@@ -237,7 +237,7 @@ depend: .depend
 
 clean:
 	$(call DELFILE, .built)
-	$(call DELDIR, libuavcan)
+	$(foreach CXXOBJ, $(CXXOBJS), $(call DELFILE, $(CXXOBJ)))
 	$(call DELDIR, dsdlc_generated)
 	$(call DELDIR, $(APPDIR)$(DELIM)include$(DELIM)uavcan)