Remove warnings
Improve response