Fixes in Boardcontroller