Fix some bugs admin