More fixing warnings