* Fixed some warnings