Clean up warnings to make compilation less red