Merge "Remove warnings from this lib, should look at fixing them."