Trivial changes to cbfs driver code.