Remove more warnings