Merge "Fix trivial compiler warnings"