TIZEN: fix compile errors
Merge pull request #451 from chrisws/branch-1-6-1

TIZEN: fix compile errors