fix remaining -Wextra issues