Fix some -Wextra warnings