--- a/android/dw.cpp	Sun May 02 10:46:21 2021 +0000
+++ b/android/dw.cpp	Mon May 03 01:17:40 2021 +0000
@@ -89,8 +89,15 @@
 {
     static int runcount = 0;
 
-    /* Safety check to prevent multiple initializations */
+    /* Safety check to prevent multiple initializations...
+     * In the simulator I get multiple calls, and code only works on the second call.
+     * On actual hardware we only get called once... so this works around that.
+     */
+#if defined(__arm__) || defined(__aarch64__)
+    if(runcount == 0)
+#else
     if(runcount == 1)
+#endif
     {
         char *arg = strdup(env->GetStringUTFChars((jstring) path, NULL));
 
@@ -303,9 +310,9 @@
             case 15:
             {
                 int (* API switchpagefunc)(HWND, unsigned long, void *) = (int (* API)(HWND, unsigned long, void *))handler->signalfunction;
-                int pageid = DW_POINTER_TO_INT(params[3]);
-
-                return switchpagefunc(handler->window, pageid, handler->data);
+                unsigned long pageID = DW_POINTER_TO_INT(params[3]);
+
+                return switchpagefunc(handler->window, pageID, handler->data);
             }
                 /* Tree expand event */
             case 16:
@@ -367,6 +374,15 @@
     _dw_event_handler(obj1, params, message);
 }
 
+/* A more simple method for quicker calls */
+JNIEXPORT void JNICALL
+Java_org_dbsoft_dwindows_DWindows_eventHandlerNotebook(JNIEnv* env, jobject obj, jobject obj1, jint message, jlong pageID) {
+    void *params[8] = { NULL };
+
+    params[3] = DW_INT_TO_POINTER(pageID);
+    _dw_event_handler(obj1, params, message);
+}
+
 /* Handler for Timer events */
 JNIEXPORT jint JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerTimer(JNIEnv* env, jobject obj, jlong sigfunc, jlong data) {
@@ -814,9 +830,10 @@
  * Returns:
  *       A handle to a scrollbox or NULL on failure.
  */
-HWND API dw_scrollbox_new( int type, int pad )
-{
-    return 0;
+HWND API dw_scrollbox_new(int type, int pad)
+{
+    /* TODO: Just create a normal box for now */
+    return dw_box_new(type, pad);
 }
 
 /*