Remove more warnings
Remove more warnings