refinement for xbmc implementation. Minor fixes.
Jira-issue: WP-1226
Merge pull request #1 from paolovergori/WP-1226_rifinement

refinement for xbmc implementation. Minor fixes.