Fix more warnings
Add cots