Corrected some warnings