diff --git a/src/ae_plugin.app.src b/src/ae_plugin.app.src
index 6be75ea..bf796ba 100644
--- a/src/ae_plugin.app.src
+++ b/src/ae_plugin.app.src
@@ -13,6 +13,6 @@
   {modules, []},
 
   {maintainers, []},
-  {licenses, ["Apache 2.0"]},
+  {licenses, ["ISC License"]},
   {links, []}
  ]}.
diff --git a/src/ae_plugin_utils.erl b/src/ae_plugin_utils.erl
index 4e7f72b..5bbfa99 100644
--- a/src/ae_plugin_utils.erl
+++ b/src/ae_plugin_utils.erl
@@ -2,6 +2,8 @@
 
 -module(ae_plugin_utils).
 
+-compile(export_all).
+
 -export([ start_aecore/0
         , load_aecore/0 ]).
 
@@ -11,18 +13,70 @@ start_aecore() ->
 start_aecore(false) ->
     {error, {not_set, "AE_ROOT"}};
 start_aecore(AERoot) ->
-    io:fwrite("Setting up data paths~n", []),
-    [application:set_env(setup, Key, V)
-     || {Key, V} <- [ {home, AERoot}
-                    , {data_dir, filename:join(AERoot, "data")}
-                    , {log_dir, filename:join(AERoot, "log")} ]],
+    application:set_env(mnesia, dir, filename:join(AERoot, "data/mnesia")),
     io:fwrite("Loading aecore and deps~n", []),
     load_aecore(),
+    io:fwrite("Setting up data paths~n", []),
+    fix_environment(AERoot),
     io:fwrite("Running setup hooks~n", []),
     setup:run_setup(),
     io:fwrite("Starting aecore~n", []),
     application:ensure_all_started(aecore).
 
+fix_environment(AERoot) ->
+    maybe_fix_setup_dirs(AERoot),
+    fix_lager_paths(AERoot),
+    ok.
+
+maybe_fix_setup_dirs(AERoot) ->
+    case application:get_env(setup, verify_directories) of
+        {ok, true} ->
+            %% Don't touch, don't reassign
+            ok;
+        _ ->
+            [application:set_env(setup, Key, V)
+             || {Key, V} <- [ {home, AERoot}
+                            , {data_dir, filename:join(AERoot, "data")}
+                            , {log_dir, filename:join(AERoot, "log")} ]],
+            setup:verify_directories()
+    end.
+
+fix_lager_paths(AERoot) ->
+    LagerEnv = application:get_all_env(lager),
+    lists:foreach(
+      fun({K, V}) ->
+              maybe_fix_local_paths(lager, K, V, "log/", AERoot)
+      end, LagerEnv).
+
+maybe_fix_local_paths(App, K, V, Prefix, Root) ->
+    F = fun(X) ->
+                case string:prefix(X, Prefix) of
+                    nomatch ->
+                        X;
+                    _Rest ->
+                        filename:join(Root, X)
+                end
+        end,
+    case xform(V, F) of
+        V ->
+            ok;
+        NewV ->
+            application:set_env(App, K, NewV)
+    end.
+
+xform(X, F) ->
+    try F(X)
+    catch
+        error:_ ->
+            xform_(X, F)
+    end.
+
+xform_([_|_] = List, F) ->
+    [xform(E, F) || E <- List];
+xform_(T, F) when is_tuple(T) ->
+    list_to_tuple(xform(tuple_to_list(T), F));
+xform_(X, _) ->
+    X.
 
 load_aecore() ->
     {ok, []} = setup:reload_app(aecore),