admin - some work on new compat mode