Changed some warning msg stuff