ISPN-2700 Fix Scala compiler warnings