Minor board fixes with code format