Fixed some bug with the admin interface