Fix a few more strict gcc warnings (no object change except for the assignment to fix initialization)