Couple hack-fixes for BMS crashes.