Some small changes to UserDAO