Add more warnings source to 1.6) and fix warnings