board v2. Minor fixes