fuji/board: fixup recent commits