BF: Fix inconsistencies.