Fix issues according to PO

Change-Id: I0218ea7cd36e8c396d32de731f37b61a1820f233