Minor changes to make "gcc -Wextra" happy