BF - Minor changes.