Fixing up CB locations