Fix some gcc warnings which become visible with -Wextra