fixed issues found by Nokia review