Admin and install fixes