Merge "Fix some compiler warnings." into nextgenv2