Board generating fixes