Fix previous CTB version leftovers