[RESEND PATCH 00/18] Minor board_f/board_r cleanups