bfsc:Contact: Fixes to Janek's review