diff --git a/src/css_composer/index.ts b/src/css_composer/index.ts
index 53b4ff54e..1cabda8f9 100644
--- a/src/css_composer/index.ts
+++ b/src/css_composer/index.ts
@@ -271,7 +271,7 @@ export default class CssComposer extends ItemManagerModule<CssComposerConfig & {
    * });
    * // output: @media (min-width: 500px) { .class1:hover { color: red } }
    */
-  setRule(selectors: any, style: CssRuleProperties['style'], opts: RuleOptions = {}) {
+  setRule(selectors: any, style: CssRuleProperties['style'] = {}, opts: RuleOptions = {}) {
     const { atRuleType, atRuleParams } = opts;
     const node = this.em.get('Parser').parserCss.checkNode({
       selectors,
@@ -435,7 +435,7 @@ export default class CssComposer extends ItemManagerModule<CssComposerConfig & {
    * // Remove by selector
    * css.remove('.my-cls-2');
    */
-  remove(rule: string | CSSRule, opts?: any) {
+  remove(rule: string | CssRule, opts?: any) {
     const toRemove = isString(rule) ? this.getRules(rule) : rule;
     const result = this.getAll().remove(toRemove, opts);
     return isArray(result) ? result : [result];
diff --git a/src/style_manager/index.ts b/src/style_manager/index.ts
index 2d7872c2b..31d02e6a9 100644
--- a/src/style_manager/index.ts
+++ b/src/style_manager/index.ts
@@ -370,7 +370,7 @@ export default class StyleManager extends ItemManagerModule<
     const { em } = this;
     const trgs = isArray(target) ? target : [target];
     const { stylable } = opts;
-    const cssc = em.get('CssComposer');
+    const cssc = em.Css;
     let targets: StyleTarget[] = [];
 
     trgs.filter(Boolean).forEach(target => {
@@ -407,7 +407,7 @@ export default class StyleManager extends ItemManagerModule<
             style,
             shallow: true,
             important: true,
-          });
+          }) as unknown as CssRule;
         } else {
           stateTarget.setStyle(style);
         }