Added 17 support. and suppressed warnings