Change handling of APPLICATION_ROOT