— Fixed some warnings