Merge pull request #978 from e78l/fix-warnings2