Fixed two warnings
Merge pull request #948 from fergus-dall/warning-fix

Fixed two warnings