Changes needed due to show_bits_long behaviour changes/fixes