Fix board management