Some fixes to avoid silly  warnings