Some fixes for gcc with strict options