Corrected all warnings