Minor improvements

Jira: APPFM-3 APPFM-7