cli + temp cms fixes