Fixed integer sign mismatch.
Fixed typo.
Merge commit 'bf1b01a04577c853089f3faa79be18d70eb28309' into develop

* commit 'bf1b01a04577c853089f3faa79be18d70eb28309':
  Fixed typo.
  Fixed integer sign mismatch.