Fix compilation failure with Boolean.TRUE
Fix ScalaStyle warnings