minor fixes after testing on pi
Jira:  WP-1142