A couple tweaks to board structure