Fixed a few warning