Reduce some gcc warnings