Small fixes regarding user id