Small fixes to several components
Merge pull request #584 from pyhalov/oi/hipster

Small fixes to several components