Merge pull request #1496 from seanpaultaylor/next

Next
Fixes for compiler warnings