[Ide] More fixes related to bug #11654