Fixing the build to remove warnings.
Merging master.