SI-7624 Fix -feature and some -Xlint warnings