Merge "Fix -Werror on 64-bit builds"