Board fixes 2
Board fixes 3