Fix warnings with newer gcc versions (I hope)