fixing all warnings