Fixed up admin functionality