Resolved all warnings