diff --git a/reference/DragAndDrop/init b/reference/DragAndDrop/init
new file mode 100644
index 000000000..a1b6c6d9b
--- /dev/null
+++ b/reference/DragAndDrop/init
@@ -0,0 +1,4 @@
+#ifndef _DragAndDrop_icpp_init_stub
+#define _DragAndDrop_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/reference/DragAndDrop/main.cpp b/reference/DragAndDrop/main.cpp
index 971c52c52..e5c35578b 100644
--- a/reference/DragAndDrop/main.cpp
+++ b/reference/DragAndDrop/main.cpp
@@ -48,8 +48,8 @@ struct MyApp : TopWindow {
 				tree.Open(parent.Top());
 		}
 		tree.Open(0);
-		tree.WhenDropInsert = THISBACK(DropInsert);
-		tree.WhenDrag = THISBACK(Drag);
+		tree.WhenDropInsert = THISFN(DropInsert);
+		tree.WhenDrag = THISFN(Drag);
 		Sizeable();
 	}
 };
diff --git a/reference/Menu/menu.cpp b/reference/Menu/menu.cpp
index ab6abe5c1..0f31e5239 100644
--- a/reference/Menu/menu.cpp
+++ b/reference/Menu/menu.cpp
@@ -5,29 +5,21 @@ using namespace Upp;
 struct App : public TopWindow {
 	bool numbers_enabled;
 
-	void Exit()
-	{
-		Close();
-	}
-
-	void SubMenu(Bar& bar)
-	{
-		for(int i = 0; i < 10; i++)
-			bar.Add(~AsString(i), [=] { PromptOK(AsString(i)); });
-	}
-
 	void Menu(Bar& bar)
 	{
 		bar.Add("Enable numbers", [=] { numbers_enabled = !numbers_enabled; })
 		   .Check(numbers_enabled);
-		bar.Add(numbers_enabled, "Numbers", THISBACK(SubMenu));
-		bar.Add("Exit", [=] { Exit(); })
+		bar.Sub(numbers_enabled, "Numbers", [=](Bar& bar) {
+			for(int i = 0; i < 10; i++)
+				bar.Add(~AsString(i), [=] { PromptOK(AsString(i)); });
+		});
+		bar.Add("Exit", [=] { Close(); })
 		   .Key(K_CTRL_E);
 	}
 
 	void MainBar(Bar& bar)
 	{
-		bar.Add("Numbers", THISBACK(Menu));
+		bar.Sub("Numbers", THISFN(Menu));
 		bar.Sub("Items", [=](Bar& bar) {
 			bar.Add("Item 1", [&] { Exclamation("Item 1 invoked"); });
 			bar.Add("Item 2", [&] { Exclamation("Item 2 invoked"); });
@@ -42,7 +34,7 @@ struct App : public TopWindow {
 	{
 		numbers_enabled = false;
 		AddFrame(menu);
-		menu.Set(THISBACK(MainBar));
+		menu.Set(THISFN(MainBar));
 	}
 };