Fixing builds with j7