fix 4.0 admin error and other small improvements