Fix warning with -Wmissing-braces enabled
Fix warning with -Widiomatic-parentheses enabled