Add some B/C checks