refinement for xbmc implementation. Minor fixes.

Jira-issue: WP-1226