*Fixed some warnings