Start of admin route fixes