Final super user fixes