Bug fixes

Jira Issue:WP-1251