Update more functions to operate as the correct user