Fix issues in the merged Tizen 3.0 code