Fixing a compile error I missed during the merge and a few warnings.