following upgrade to Kotlin 1.6.10, there are a bunch of warnings due to some deprecations.. let's clean this up !