Adding some misc things to support the admin page