Make Admin (mostly) working