Several small fixes:
 - remove Scala feature warnings
 - fix an error with brand adding