1. Some fixes in AdminBase.