admin fix and etc.