minor improvements
bug due to change in core Plasma behavior fixed