Remove some compiler warnings
Merge branch 'refs/heads/0.13' into topic/remove-warnings
Merge pull request #1613 from jedesah/topic/remove-warnings

Remove compiler warnings