Some fixes to the board